* files.el (set-auto-mode): Fix invalid setq call.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb1f0868d5bba95ccd5d690c0e5118e0b6c9e609..22fedc4095c0c3f33ba38c891363efe91b532ac6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-05  Chong Yidong  <cyd@gnu.org>
+
+       * files.el (set-auto-mode): Fix invalid setq call.
+
 2012-08-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * isearch.el: Misc simplification; use defstruct.

diff --git a/lisp/files.el b/lisp/files.el
index 0c89566954240e9aa67f72512ba9a97c3b775e6c..2b4ae460c3e423a0af3a7a20e3d9baec7ac19ade 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2734,7 +2734,7 @@ we don't actually set it to the same mode the buffer already has."
                       (cadr mode))
                  (setq mode (car mode)
                        name (substring name 0 (match-beginning 0)))
-               (setq name))
+               (setq name nil))
              (when mode
                (set-auto-mode-0 mode keep-mode-if-same)
                (setq done t))))))